menuitem: Remove unneeded checks
authorBenjamin Otte <otte@redhat.com>
Wed, 30 Apr 2014 07:24:17 +0000 (09:24 +0200)
committerBenjamin Otte <otte@redhat.com>
Thu, 1 May 2014 12:51:28 +0000 (14:51 +0200)
Size vfuncs always get non-null out variables passed, so no need to
check for NULL.

gtk/gtkmenuitem.c

index e36715feb9080e430f8a933ab1e367bc4273fd34..2b7e049fdb2b4837891e6c814409c02759068609 100644 (file)
@@ -903,11 +903,8 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
                          &accel_width);
   priv->accelerator_width = accel_width;
 
-  if (minimum_size)
-    *minimum_size = min_width;
-
-  if (natural_size)
-    *natural_size = nat_width;
+  *minimum_size = min_width;
+  *natural_size = nat_width;
 }
 
 static void
@@ -1016,11 +1013,8 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
                          &accel_width);
   priv->accelerator_width = accel_width;
 
-  if (minimum_size)
-    *minimum_size = min_height;
-
-  if (natural_size)
-    *natural_size = nat_height;
+  *minimum_size = min_height;
+  *natural_size = nat_height;
 }
 
 static void